d/p/03_.. update use of dict path

diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch
index 95dfe0a88fc25497ec82acfc863e7c783729155a..abc3e79fa0e09b1ba28e162139f7bbac3c471a5b 100644 (file)
--- a/debian/patches/03_datadic_install.patch
+++ b/debian/patches/03_datadic_install.patch
@@ -10,3 +10,31 @@ Forwarded: no
 -INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
 +INSTALL(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION ${DCMTK_INSTALL_DATDIR} COMPONENT data)
 +INSTALL(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${DCMTK_INSTALL_DATDIC} COMPONENT data)
+--- a/CMake/GenerateDCMTKConfigure.cmake
++++ b/CMake/GenerateDCMTKConfigure.cmake
+@@ -83,10 +83,10 @@
+   SET(ENVIRONMENT_PATH_SEPARATOR ";")
+   # Set dictionary path to the data dir inside install main dir (prefix)
+   IF(DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+-    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\dicom.dic")
++    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\dicom.dic")
+     # If private dictionary should be utilized, add it to default dictionary path.
+     IF(ENABLE_PRIVATE_TAGS)
+-      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIR}\\\\private.dic")
++      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH};${DCMTK_PREFIX}\\\\${DCMTK_INSTALL_DATDIC}\\\\private.dic")
+     ENDIF(ENABLE_PRIVATE_TAGS)
+      # Again, for Windows strip all / from path and replace it with \\.
+     STRING(REGEX REPLACE "/" "\\\\\\\\" DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}")
+@@ -104,10 +104,10 @@
+   SET(ENVIRONMENT_PATH_SEPARATOR ":")
+   # Set dictionary path to the data dir inside install main dir (prefix).
+   if (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+-    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/dicom.dic")
++    SET(DCM_DICT_DEFAULT_PATH "${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/dicom.dic")
+     # If private dictionary should be utilized, add it to default dictionary path.
+     IF(ENABLE_PRIVATE_TAGS)
+-      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIR}/private.dic")
++      SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}:${DCMTK_PREFIX}/${DCMTK_INSTALL_DATDIC}/private.dic")
+     ENDIF(ENABLE_PRIVATE_TAGS)
+   ELSE (DCMTK_ENABLE_EXTERNAL_DICTIONARY)
+     SET(DCM_DICT_DEFAULT_PATH "")